White space normalization and other minor fixes.