more and more and more fixes