numerous changes to definitins of mixed content patterns