Multiple improvements and help