Fix comments
Add comments