more lab4 fixes