propagation cleanup
merged with pw changes
linear interpolation in track build