- Fixed small issues
- Increase robustness of batch jobs
- Increased debugging