working on sorting
fixes