General updates

First round of updates to convert original aperture analysis script to
analyze aperture2