Made some comments to core files