changes to paper
merged conflicts in paper and arxiver