Cpsc372 fixes

Fixes for Murali's class.