A few changes from meeting presentation (mainly comments of what to fix)