Fix ordering bug in boolean expressions
Add non-functional links for clients
typo fix