Some more minor changes and punctuation fixes