more fixes lab 2