Make task references to a project

Make task references to a project and adjusted more stuff..