lab3 fixes