Minor tweaks here and there. Adding SubBlocks to BoatBench