minor debug level changes
merge to resolve conflicts