Core: 
Fix of the comments