lab1 done, lab2 fixed