Wrote more on types and broke up subject matter more thoroughly.