added some signal model fixes