new features, and edits