more fixes, still not working