remove markov
futzing
tweaks and conflict fix