Second pass, a few polishing changes