New levels now don't crash

Also fixed up some other code