Added and corrected header comments