Threadin pass and final touch up

The bot is now release ready, I think.