Lab 7 homework draft and small misc fixes