Mostly cleanup and stuff

Been making little changes for a few weeks now, since I don't really
have time to work on this anymore.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md