each block, more cleanups, update docs