Code cleanup from Upgrade: plotting tools and addition of simple 2 state model for geometric MCMC