Going through everything with Ernesto.
Made the citations right.
First changes from Ujwal.