Made it easier to parse Punish/Reward output
Largely final checkin.
Made the input a little more sane.