New A edit logic, update docs, index new fields