finished lab2 fixes