Edits, reorganization, and some new stuff