Refactored order of "Types" subsections and added a few as well.