opp dates fixes and improvements