lab2 improvements
lab3 added