Adelta mods form - partial improvements