Write s where necessary (4/47)

Write s where necessary