Fixed Lab 2 erros