more fixes lab 3 and 4