Buttbot additions/Fixes