minor edits to common_tools