Bugfix[0]
BugFix[1]
BugFix[2]
BugFix[3]
BugFix[4]
Final submitted version for HW3