Better variable handling

Penguins and Higgs working again