Write s where necessary (7/47)

Write s where necessary