add some people, fix some botched pull requests