Probably some improvements

Or I’ve broken it, I don’t know.  Whatever