Update for BlockBody
Various cleanup