small after the fact tweaks

a bug fix, better goal tracking, and another bug fix