Various changes based on reviews. Thanks reviewers!