more, fix index calculation
fold in, and get things into word class