Heckler messages

Minor update to messages, ready to merge.