WIP: changes from Mark's live review
Addressed PR comments