Multiple bugfixes in main and when starting job.
Mapper still not working propertly.