fixe various things (see commit messages)