Assignment Six fixes.