daemon check and minor improvements