Paralel support + bug fixes