Nailed some bugs which broke simulation and netlisting