Minor bugfixes, some small formatting adjustments because the pep linter complained
Changed bot rotator so that it defers to its own thread, rather than running in (and blocking) the main process