Bunch of updates and CI