Updated comments and ordering.