added window functions + waveforms now to JSON format