i/a-defs => dicts, more saving stuff, cleaning