Jeremy Newman : add some more debug logging