Fixed everything that others found wrong