Indentation and some spelling fixes, based on #1