Changed project-stage to project stage and other changes