finished lab3, fixed lab2