Several code of style and content fixes.