Enhance comments.
Fix out dependency h file.