improve logging and messages