some fix in project, added new logic in projects (not tested xD)