mainly systemd and some typos