improvements in daemon, fix in models