tweaks to trimming/clipping logic. producing cleaner reads