Tweaks to md and whatnot