minor prototyping edits