[new model] fix parsing; improve navigator