fixes to lab 2