add more logging to aid debug