minor fixes, still not working