Minor cleanup and cosmetic fixes
Indent changes. Implemented block to block join. Should work fine. Needs testing
Bug detected in certain situations when stone joins block.
See Redmine issue #9