catkinization fixes, but still not yet working.