Updated MartinFox dir to have fewer extra changes -- again