fixed major glaring issues!
Merge pull request #154 from jhaybie/finalTouches

fixed major glaring issues!