Complete lab, fixed error messages