Simplified the Outcome class & completed CA fixes.