editor levels and some editor bugs
Merge branch 'master' into Robbin