fixes n stuff
Merge pull request #1 from GantMan/master

fixes n stuff