Add --take and enhance command line help