splitting out & fixing up reduceGoal

- bugs before messed up numbering, this should fix some of those.