increment only when new job is sent

also some other minor stuff