Added automatic audience, few fixes