again some fixes ....