More bot changes, should be mostly stable now