more more fixes