job fixes, map cleanup and RD expansion