Improvements on cleanbot update