added more lorentz parameters, tightened interface