HW4 complete: adjustments to fix autograder issues