more fixes to lab4