Bug fixes and improvement of parallel processing