further changes and cleanups for fox but still not working

more investigation necessary