A/P indicator + minor performance improvements