fixes, still not usable