fixed a couple bugs, changed monitor output
merging master back to dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev