Cleanup
More moves, and a big initialization bugfix