A bit of cleanup and updates to debug and example bots