Improvements with bots, still really buggy