Improvements / corections about layout, punctuation...