Fixes and changed from ORB to SURF