Fixed everything for project