removed currentAction observable from router, misc cleanup, WIP routeSegment()