updated wavegen times
fixed merge conflicts