Class 3 Lab 02 and bug fix for lab 01