Lab 04 blocks complete

Various comment fixes and minor style fixes.