Fixed comment messages for correctness and additional tags