again some fixes by all