- Added a new way to sort
- Tweaks to formatting and sort unit test