Stage 4 works again + small bugfixes
Merge branch 'lab3'

Merge newest changes
Removed lots of debug output