minor fixes to goal selection