Fixed some things asg 3