Improve feature extraction from wavemark 1