A few more changes. Trying to beat the level code into shape.