Fixed a bunch of small things
Blegh
Blegh