Adding flag to only copy a single index, minor clean-ups, and futher rubificiation of some of the output logic