Wording modifications.

- Add a more comprehensive explanation of concepts and cosntraints
- Update concept stuff.
merge from asutton/master