More changes

The commit messages ~explain them.