minor checks and logging
merge