update comment
Fix a compilation warning
Fix a normalization issue.