Trimmed white spaces and minor fixes.