some opinionated changes