mainly some logging changes