Fixes in lab 3, added lab 4