Review and fix block implementations

This mentions nodes. Fix this and we can merge.