minor additions
merged conflicts