Trigger & other bug fixes, 3.1.16 release.