Lots of stuff

Massive edit to level