Clean up the rather nasty logoc of snova(), and fix a minor navigation bug.