Throwing out 'level system' i portals, small refractorings & fixes