Many stuffs

Add trigger objects and other tweaks