Add comment and small fixing