fixes to get reasonable values of dE/dx. Still debugging