Bug Fixes

- Reported bugs fixes
- Improved lane sorting
- Addition of a sorting module
- Tests updated