Update

Slightly adjusted versions of some files, at Martin's request