Better logging

#1 is hard to track without proper logging