Fixed a bunch of links and foramtting