More goal fixes. Should eliminate the LTG avoid goal problem.
Another goal fix to prevent getting stuck. Everything appears to be working.