Cleanup
Improvements to TermApi.substitute, comments, findAll