Some fixes and improvements. Cosmetic