Fixed more links

Couple of typo's and misplaced functions.