Fix framework bugs, and add some convenience
Update bot to use framework properly