Fixed everything that went wrong when merging.