Fixed a ton of things, and cleaned up a lot, paving the way for 1.7