Router added.
Bug fixes.