Fix word-structure
Fix refine-mark