Cleaned up some of the definitions.
Updated document based on feedback from Dean.