fixes in lab 1,2,3,4