more vectorization tweaks