lots of fixes when not too many words