further deamon-related changes