Updated for 1.6

Updated bot for 1.6, made a few other changes.