Fixed everything wrong