some files needed more correction, done manually now ...