WIP bot improvements and stuff