smaller analysis tweaks