AuraWatch improvements