Bug/feedback penalty

@jpslav, @kjdav - Needs review and testing.  Both these fixes have subtle changes.
I think @kjdav uncovered a subtle but horrible bug here.  @jpslav , can you verify this one please.