various edits for workshop