late night tweaks to our goals

The second push (just now) repairs the bug you found.