added various checks and triggers

Change-Id: Ib81ac2328f7649f8707541717b5a7c15262c8d30