fixed various bugs
changing as per comments
Merge pull request #126 from cordoval/124-fix-typo

Fixes, minor improvements, very clean clean up :)