Winter cleaning

Mostly cleaned up stuff, preparing for code to go in.