bunch of changes to make pairs data nicer