Update

Consolidated triggers, added descriptions