Made a bunch of additions/changes.