Fixes and additions.
Merge pull request #257 from nZEDb/dev

Fixes and additions.