Fixed minor bugs in Lab 2. Ready for passoff?