Bug fixes

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