Write s where necessary (3/47)

Write s where necessary