Tweak systematics file and clean up some datacards