Fixed navigation. Other minor bug fixes.