Fixed a few errors, brought up a bunch of link errors