fixed project support, now on and working regardless of ordering of project or context