More bugfixing
Merged down
I THINK WE'RE DONE?
Merged it all and push it up