More fixes and word rearrangement