fixed more minor shit
Merge pull request #152 from jhaybie/finalTouches

fixed more minor shit