a few small const fixes and decorative changes
Merge branch 'sshopts' into charles-refactor-blockchain