Improvements with clitic stems, some more fiddling still needed