flushed out launch API some more and added CLI options