Finishing updates

In with the new, out with the old.