Bunch of updates getting everything synced