Small change to lab2 and worked some more on lab5

A bit more is working.