Fixed routing problems; watch typos