trigger fixes

for real this time