Ran through the validator and made some adjustments.