Final structure and syntax improvements.