fixes in lab 2
fixes in lab 3
Merge pull request #54 from lewenhagen/master

fixes in lab 2