Several refinements on versions and file handling