fix for ilepton=3,4 plus some cosmetic changes