Fixed a couple of bugs, updated many comments, and am including a...

Fixed a couple of bugs, updated many comments, and am including a comprehensive test for when there are only 3 types in place.  I need to do something similar for 4 and maybe more types, but I'm not sure how comprehensive I can make the test at 4 and above types.

llvm-svn: 148038