Finished feature extraction stage and added matching of FPs