Arch workings. Some EDFD fixes.