Andrea reworked Batch Render for changes + minor fixes