Finished up the two-surface calculation and cleaned up a bunch of details.