more yaml touchups