various tweaks

probably best to review the commits individually (details in the respective commit messages)