do requested fixups, broke sse2 vectorization