More editing based on comments

Especially fix optimization sentences