Cleanup + Improvements #1

Made some changes to improve overall reliability/efficiency of the bot.