Right on both (me being a sensible person and the 0.01% formulation should supersede the 0.03% plus the shorter IP protection for the latter).