improve chimpbot
merge conflicts