Marking lab done, adding some fixes.