Write s where necessary (1/47)

Write s where necessary