fix indentation in Daemon.py + some more tweaks