refactors some links, adds helper methods