added settingslogic
amended configs in models, tests