Did some things, fixed something, and added stuff. Basically, small commit of random stuff
Merge remote-tracking branch 'origin/master'