put back some commands that were removed
a few tweaks
Merge pull request #409 from nZEDb/dev

Dev