fixes
More changes
   * Updated comments.