Fixed routing errors and typos