Follow-up on review feedback, more tests and some clarity.