AUTOADD and more improvements