final edits

@BrandtWilson please review, merge