manual fix merging back

manual adding changes from ZinnIxtar (listeners / state 2)
ignoring small change from xx Reyes (llSleep)