some useless stuffs removed
some more changes
testing remaining
gesture extraction extracted