Added bots, fixed various issues
fix for last commit