adding more logging + fix