fixed most of issues due for 3/7 assignment