bug fix in unbind + faster detection
more work