misc small edits and bring the paper down below 25 pages