Small fixes to the preEvaluation functions and better integration with the two existing Success Criteria.