some fixes, still not working