typo fixes
code issues fixes
Merge pull request #117 from rilian/master

some typois and code issues fixing