Increased level loading reliability. Fixed some bugs.
Merge branch 'jc-level-loading'