basic-1.3: fix comments, log messages, and constants