WIP: minor edits from jeff phillips