Made a lot of changes

This is the second pull request that was merged into a single commit and
committed to this repository directly.