Bug fix: project now build (with a lot of bugs