and again some bugs