Fixes to theorist; still not working