Correct messages, more logging