continue to bugfix the navigator
rebuild and test...