misc fixes/tweaks
Merge branch 'develop' of https://github.com/xnova/counterblockd into develop