Updated comments and log messages.