added methods where you can alse set the source of the message
removed some duplicated debug outputlines