even more fixes lala