Fix errors with rewards, cleanup