tweaks and sorting