Reverb and changes to code gen