Improved type parsing, and tested the new products.