Fixing router initialization.
More bug fixes...