Included supertype
New cards; minor style fixes