Lab 7.1 and smal changes to other files