#169 last minor changes before "daemon mode"