Updated Project Creation
Fixed some merge issues