Fixed the sorting issue.
Merged minor diffs.