I did a bit of ad-hoc testing & fixing.