Improvements to the deamon