just more fixes