Tuxbot config changes

And manually merge my fixes... /lol