Fixed 2 small bugs.
Fixed my own epic derp...
Merge branch 'develop' into buildchanges
Some final tweaks. Ready to merge!