Cleaned up borkedbot.py and other small changes