(hopefully) final changes to lab2