added fixes from LevelFixes branch