Yet more fixes

almost done
Final fixes

All names in /nerf should no match MM names