Several modifications

See details on the changed files.