update debug messages
merge: auto + manual