changed some settings
merged