Fixing some things and trying to debug others
Adding some OpenMP stuff to speed large simulations up (hopefully)