Fixed everything from feedback