fixed some linking/navigation issues-- hopefully...