merge in jvf changes and lepton branches