change to avoid null threading conditions
merge some changes
removing sticky events when an handler got hold of it
formatting changes