Write s where necessary (2/47)

Write s where necessary