Support umount/stop for commandline and systemd. Fix several typos.