Some edit suggestions from raggi