Interpolating all data correctly.  Also fixed conversion from number of safs to number of people