Lots of fixes! better modulation