fixed some stuff so the projects are merged again