fix: more func qualifiers
chg: switched off more swizzle code