Bug/feedback penalty

@jpslav, @kjdav - Needs review and testing.  Both these fixes have subtle changes.