HapticGlove - Updated collision detector and refactored some code