mostly paper edits, some analysis stuff