fixes, but still not final