Last minute updates!
Merge branch 'clarafinal'