Changes to intro and other minor changes
Merge conflicts with daoud