More changes and fixes to level2