fixes on lab 3/4