Merging

Minor changes, most of them will be erased. It was a first try to fix
the manifest file, but aborted.