Tracking refactoring

- extracted keypoints detection
- some corrections..