Changed Map behaviour

changeable goal and base positions