Add final changes for homework submission