fixed service leaking
use default gesture detector
cleanup