* Better logging, remove unused method, re-try handling fix. Other minor fixes. * fix test * typo fix