Make type actually tuple for default files
Various docstring and whitespace changes