Lab 2 minor bugs/unimplemented