fixing some issues with the core bot and cleaning up a bit