Add CI, plus other changes