parallel processing + minor fixes