Minor API changes (edit -> author), simplify flow