Fixing some routing errors and changed some verbiage