Iteration1 rewardfix

I've left some comments on commit ce27cfa explaining where I think things went wrong.