fix on daemon and some monitoring