Improved Markov chain, a bunch more stuff