Miscellaneous tweaks and twiddles
Updated related terms
New terms