fixes in lab 2