- Improved prim batching
- Some cleanups