Fixed some typos in Router, revised Forwarder