more nav twiddling per #41