initial project flow partial fixes