Minor changes in System, Integrator and Main.