various upgrades and microoptimizations to ADD group