a few more minor edits, hope to finish in the morning