A number of additions, removed some unnessary sections.