Some updates, see commit messages.