Lab3: more fixes

Joseph Schmidt, 9/17/2014, Lab3. Finishing up the testing, so after one
more check, Lab3 will be done. Here is what I picked up on the last
check though.