I'm not sure where I was, this mostly seems to be fixes.