Minor improvements.
Added remove listeners func.
Switch over to designated message/data listeners.