Lots of fixes and features and stuff.