Updates for some whitespace and other minor issues.