restructured the bot + some small changes