Cpsc372 fixes