Merge pull request #209 from 3xp0n3nt/batch-render-dev

Fix rendering bugs & improve error handling.
Merge pull request #210 from 3xp0n3nt/batch-render-dev

Fix rendering bug.