Minor tweaks; restrict list of valid characters in filenames.