4.0: Add resource deamon + bugfixes