Finsihed some minor edits