More updates.
Revert "More updates."

This reverts commit 2db82ad9249a59a2a7c840f4ae969740eebc48ca.
Revert "Update format of PSpec and Delta-Variance."

This reverts commit 7ceee1e7122c22e41d17f4be91d2bff611573625.
Revert "Revert "Update format of PSpec and Delta-Variance.""

This reverts commit e685d284ee7604ae1109802ef27c441fc5bc63d6.
Revert "Revert "More updates.""

This reverts commit 58589e6dc15d8219b4388ef8c705a866f381bd75.