Some polishing, spell checking