docs
no_substr feature
clean-up