Various corrections / improvements