Misc

See commit messages
CSV file