improved support for tagged lang & factors