finished edits on discussion, cleaned up notation throughout