Added slightly more logging
fixed some logging