Project fixes

this makes the whole project much easier to compile