Timer -> Fix double start timer bug.  This was probably responsible for a lot of odd behaviour other had reported (Location Trigger twice, Multiple Sets, etc).

Use the appropriate timer method in State2