General cleanup and behave more like multibot.