Cleanup + new wavetables

Some cleanup