Changing doppler and log models, and adding Composite and WeightCombination models