minor tweaks to fix accidental trimmed branches