daemon improvements