Add more two-point integrals
Change some global settings