some small improvements

see commit messages for details :)