Did some suggested changes.