various fixes to the second lab

Reorganized some of the definitions in Vol1.tex as well.