again some fixes