updates to lab1, adding to lab2