minor edits and testing