fix docs; raise instead of returning a failure
rename for consistency
break up logic; fix CommandExited