some small adjustments

(see commit messages)