Update how triggers are handled
Fix typo