Fixed sort order, fixed patch review and commenting.