fixes to try to get this router diaganostic right