Added a few new types and updated some comments.