minor tweaking relating stuff explicitly to goals