Trigger and tweaks & fixes