added tests...
adjusted CMakeLists.txt
couple of adjustment, courtesy of clang
offset from mouse clicked now retained
some cleanup and renaming