more tweaks
Merge pull request #271 from nZEDb/dev

more tweaks