Some stuff

You were "busy" on skype, so I decided to just learn Pull Requests quickly. lol

Fixing some quick stuff