merge champ sorting into basic processing, fix drop marking