Fixed Bugs in HW5