lots of updates to lab2 and corresponding solutions