Finished first run though and made corrections