more triggers, API further refined