better logging, a few more calls