minor tweaks to abstract and intro
fixed merge conflict