comments and final patch for review