*cleaned out commented code
channel on message fix part 2