more content stuff, initial cleanup