refined parallization + bug fixing