fix several comments and log messages