Add Custom Type example and testing.  Minor cleanup.