Added some subtopics and cleaned things up.