Improved logging / more DEBUG output