Expanded on the features, cleaned up the language