fixed various modulator bugs