Added a ton of support for "correctly" calculating Ip, which should
allow for a correct calculation of effective area, area, and intensity.