More navigation altering fixes #11 and adds partial fixes for #5.