Several updates, see commits.