more improvements to Markiv