updates & tweaks to markup system