minor modification

adding 2 new waves form
moving ADSR controllers