new parallel option
small cleanup