Still "tweaking" triangle and sine waves rest working fine.