Fix header
Fix some comments