Rebuilt the project properly and fixed all issues

Mess of issues solved by a redo