Some improvements to Integrate.m