bug fixed + lab2 update