1st pass at fixing traveler (gotobase, etc)