Few bugfixes, start building job data structures