Added a bunch of updates