math stuff
line edits to analysis
merge