CS fixes
CS fixes
moved batcheventprocessor + cs fixes