Updated a bunch of stuff
Updated links