Fixed everything but edge files