Clean up file output - suppress generation of unrequested files.  Minor changes to popsyn file output.