wordbased features rewritten, cleanup.