fix comment messages