catching up a bunch of changes with the repo