Lots of minor changes, including correct leveling