Cleanup and spelling fixes