improved logging slightly;