minor changes to paper
merging stuff