bug fixes
fixed a couple bugs
typo
Merge pull request #200 from nZEDb/dev

Dev