various improvemens