Sort categories, fix bugs
[v1.1.5] release