Add unless and fix subshell commands