Committing a bunch of misc changes.