fixes in Text
fix invalid entiy relationships
use camel case for entity fields