updates following testing (numerous navigation issues fixed)