fixed a few navigational bugs