Updated comments (Raffaele)