tweaks based on matt feedback