add another inst, fix re-triggering, other stuff