Polished lab 1 (and fixed a bug)