Various small updates, see commits for details