Added comments, sorting