Adaptive mcmc and minor changes