log improvements
merge