clean up limits
fix messages order