more tweaks to lab2