MORE fixes and tweaks! Probably forgot some, but that's how it goes.