smoother navigation. some performance fixes.