job submitter enhancement and some fixes