Sorting integrated (except comments by images). Ready for merge into main branch.