association select, routing added missing features again, reorg cleanup