Minor bug fixes; added some code for table manipulation in the router host.