Better control of the bot + lots of small improvements