cleaned up code; got rid of JOB_TYPE_NAME dict; fix of regular_build