more and more fixes