Made final round of changes.