Added Matteo and other minor updates