Add daemon; Other minor fixes.