Joined terms & types
Cleaned up README.md