vba transform
Slightly saner filenames
Some war fixes