MapQuest directions added, other refactorings