More editor fixes, and added another level