Self-review plus some more fiddling around.