Simplified things greatly.

Turned off gibbs and metropolis sampling. Results unchanged though.