Add Normalize
Fix comments