More whitespace changes.
Re-added CR's files.