improved logging / control