add a goal, navi to goal
Code cleanup