daemon & job improvments