Minor changes

Some Changes to hrefs and organizing code.