Enhanced trinity handling.

Added Velvet.

Upped version number to 0.8.4.