Added text features, organized things, added underscore