got limits on the messages working
cleanup