Improved resolution of L_2500
Merge Juan's constants changes with James' improvements of L_2500