initial project flow fixes