some improvements on integration modules and PN stuff.