various
merged with nicolas