3.0.0 Pull Request

Here is a pull request for all of my changes so far.  I could not figure out how to do them individually.