fixes

trigger fix (I think.. needs more testing later), quotes/parens fix