Blaher v1
Actual sorting
Some fixes / prettifications