Small improvement of the keypoint features (added parameters, cleaned up the code)