added text and simplified some classes.