Add logging and adjust some messages.