fixed self-optimization detection, changed batch size