fixes to filename parsing, generation
merge