ep 04 - merge in

ep 03 - pull in copy edits from develop

part of merge process