cleanup and highlight language-specific components that will go away
fix (of) for english
add one english parsing test