Dev

Speed-Ups and Parallel Versions complete