settings implemented, changed labeling for history