Condense and fix a few things
Merge pull request #1 from gomeow/master

Add my stuffs