minor edits & adjustments