Fixed letter matcher and included waitOn functions in router