added all settings!
merged with koentje