Almost done with final edits, and changes to graphics