Changing "subtype" to "lineage", a few extra changes.