some fixes in various files

see commit messages