More fixes to exercises lesson 1 and 2.