corrected doppler shifting
added amplitudes and more velocity functions