fixed some bugs, pop now return the job