update from machiels pc
merge analysis with analysis from office pc
merged some files