added more logging
merged changes