Cleaned up and fixed permissions