update. Also changed the defaults block types in the layout so that they match the gate-level netlist. This does not change the behavior after assembly but lets LVS run correctly on the layout prior to final assembly.