reorg fix
fix indentation, compile
Merge branch 'charles-refactor-blockchain' into lsm