fixed extract_features bug, moar edits