minor tweaks
forgot this
Merge pull request #605 from nZEDb/dev

Dev - dunno why these didn't merge the last time
Merge branch 'master' into brian