fix file modification time and cleanup
One file modification fix, some general cleanup and required preparations found during the metadata writing branch
Edited by Alexander Stippich
One file modification fix, some general cleanup and required preparations found during the metadata writing branch