minor edits from workshop submission