Updates to add support for more net types and fix parsing of some tags.