Create an \ON\Router so we can override and do our own stuff. Fixed bugs too.