Break long words
Few minor changes