Latest changes fixing file linking, filenames and encoding