Small changes and reorganization in feature categories discussion.