improvements in daemon