setup tweaks to align with "standards"