some edits to conf