Fix typos and fix broken routes