reviewed by jelte via jabber. Changes some log message descriptions and some function arguments and some output.