more fixes but still not working