Minor edits, name changes,text view changes