Fixed a bunch of stuff
Merge remote-tracking branch 'origin/master'
"merging"