subtle adjustments
merged a few conflicts