Fixed Stuffs

Fixed everything! Lol, had a lot of fun.
Merge pull request #1 from kodehub/master

Fixed Stuffs