Overhaul lots of stuff