Fixed a bug in the router and changed a few words