some fixes (online+ batch processing)