dev/add-new-options

Add some new options to help with systemd support (and --query for non-shell queries).